Document allowed values for ifactory.

        * gtk/gtkitemfactory.c (gtk_item_factory_popup,
        gtk_item_factory_popup_with_data): Document allowed values
        for ifactory.

        * gtk/gtkitemfactory.c (gtk_item_factory_delete_entry): Make
        it work for paths with underline accelerators.

diff --git a/ChangeLog b/ChangeLog
index 164a6f104c14ef89043567e204daa23cf5488a5f..73cc454787168f3ea97823b25749f386f7b2e009 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-01-21  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_popup, 
+       gtk_item_factory_popup_with_data): Document allowed values
+       for ifactory.
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_delete_entry): Make 
+       it work for paths with underline accelerators.
+
 Fri Jan 18 16:31:21 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 164a6f104c14ef89043567e204daa23cf5488a5f..73cc454787168f3ea97823b25749f386f7b2e009 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2002-01-21  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_popup, 
+       gtk_item_factory_popup_with_data): Document allowed values
+       for ifactory.
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_delete_entry): Make 
+       it work for paths with underline accelerators.
+
 Fri Jan 18 16:31:21 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 164a6f104c14ef89043567e204daa23cf5488a5f..73cc454787168f3ea97823b25749f386f7b2e009 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2002-01-21  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_popup, 
+       gtk_item_factory_popup_with_data): Document allowed values
+       for ifactory.
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_delete_entry): Make 
+       it work for paths with underline accelerators.
+
 Fri Jan 18 16:31:21 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 164a6f104c14ef89043567e204daa23cf5488a5f..73cc454787168f3ea97823b25749f386f7b2e009 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2002-01-21  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_popup, 
+       gtk_item_factory_popup_with_data): Document allowed values
+       for ifactory.
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_delete_entry): Make 
+       it work for paths with underline accelerators.
+
 Fri Jan 18 16:31:21 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 164a6f104c14ef89043567e204daa23cf5488a5f..73cc454787168f3ea97823b25749f386f7b2e009 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2002-01-21  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_popup, 
+       gtk_item_factory_popup_with_data): Document allowed values
+       for ifactory.
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_delete_entry): Make 
+       it work for paths with underline accelerators.
+
 Fri Jan 18 16:31:21 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 164a6f104c14ef89043567e204daa23cf5488a5f..73cc454787168f3ea97823b25749f386f7b2e009 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2002-01-21  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_popup, 
+       gtk_item_factory_popup_with_data): Document allowed values
+       for ifactory.
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_delete_entry): Make 
+       it work for paths with underline accelerators.
+
 Fri Jan 18 16:31:21 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 164a6f104c14ef89043567e204daa23cf5488a5f..73cc454787168f3ea97823b25749f386f7b2e009 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2002-01-21  Matthias Clasen  <matthiasc@poet.de>
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_popup, 
+       gtk_item_factory_popup_with_data): Document allowed values
+       for ifactory.
+
+       * gtk/gtkitemfactory.c (gtk_item_factory_delete_entry): Make 
+       it work for paths with underline accelerators.
+
 Fri Jan 18 16:31:21 2002  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtktreeview.c (gtk_tree_view_size_allocate): only resize the

diff --git a/gtk/gtkitemfactory.c b/gtk/gtkitemfactory.c
index 780d2d7b1c79f56df9f1dea93ea1a4188d2af0a2..af4299761f13694b0ac622537b5cff7673958279 100644 (file)
--- a/gtk/gtkitemfactory.c
+++ b/gtk/gtkitemfactory.c
@@ -1326,10 +1326,24 @@ void
 gtk_item_factory_delete_entry (GtkItemFactory         *ifactory,
                               GtkItemFactoryEntry    *entry)
 {
+  gchar *path;
+  gchar *parent_path;
+  gchar *name;
+
   g_return_if_fail (GTK_IS_ITEM_FACTORY (ifactory));
   g_return_if_fail (entry != NULL);
+  g_return_if_fail (entry->path != NULL);
+  g_return_if_fail (entry->path[0] == '/');
+
+  if (!gtk_item_factory_parse_path (ifactory, entry->path, 
+                                   &path, &parent_path, &name))
+    return;
+  
+  gtk_item_factory_delete_item (ifactory, path);
 
-  gtk_item_factory_delete_item (ifactory, entry->path);
+  g_free (path);
+  g_free (parent_path);
+  g_free (name);
 }
 
 /**
@@ -1429,7 +1443,7 @@ ifactory_delete_popup_data (GtkObject        *object,
 
 /**
  * gtk_item_factory_popup:
- * @ifactory: a #GtkItemFactory
+ * @ifactory: a #GtkItemFactory of type #GTK_TYPE_MENU (see gtk_item_factory_new())
  * @x: the x position 
  * @y: the y position
  * @mouse_button: the mouse button which was pressed to initiate this action
@@ -1449,7 +1463,7 @@ gtk_item_factory_popup (GtkItemFactory            *ifactory,
 
 /**
  * gtk_item_factory_popup_with_data:
- * @ifactory: a #GtkItemFactory
+ * @ifactory: a #GtkItemFactory of type #GTK_TYPE_MENU (see gtk_item_factory_new())
  * @popup_data: data available for callbacks while the menu is posted
  * @destroy: a #GtkDestroyNotify function to be called on @popup_data when
  *  the menu is unposted